From: Ray Strode <rstrode@redhat.com>
Date: Wed, 6 Feb 2013 22:40:02 +0000 (-0500)
Subject: loginDialog: fix cancel from "Not Listed?"
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4756
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7da186d4e968ff4821aee58bdafaaedbed0509fe;p=gnome-shell.git

loginDialog: fix cancel from "Not Listed?"

Since commit 1ae0fadbf483128e27565baba6e8684bc5defca2 we
no longer start a PAM conversation as soon as the user clicks
the "Not Listed?" button.  Instead we defer starting the PAM
conversation until the user types their username.

Unfortunately, the cancel button resets the dialog back to the
user list indrectly by cancelling the current PAM conversation.

This means if the user hasn't yet entered thier username then
the cancel button doesn't work.

This commit performs a direct dialog reset in the case the
PAM conversation hasn't been started yet.

https://bugzilla.gnome.org/show_bug.cgi?id=693756
---

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index 1c09c29eb..d2b93ba72 100644
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -894,7 +894,10 @@ const LoginDialog = new Lang.Class({
     },
 
     cancel: function() {
-        this._userVerifier.cancel();
+        if (this._verifyingUser)
+            this._userVerifier.cancel();
+        else
+            this._reset();
     },
 
     _fadeInPrompt: function() {